Primary key violation fix